messageTray: Rename bannerBodyText to body in Notification object

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3173>

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index d2c49fbb70c8ca6b3c7ab5c645fb470edf8ff021..7e2be6558a5da186aac34a7b8d6bf74628630fea 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -767,7 +767,7 @@ export const Calendar = GObject.registerClass({
 export const NotificationMessage = GObject.registerClass(
 class NotificationMessage extends MessageList.Message {
     _init(notification) {
-        super._init(notification.source, notification.title, notification.bannerBodyText);
+        super._init(notification.source, notification.title, notification.body);
         this.setUseBodyMarkup(notification.bannerBodyMarkup);
 
         this.notification = notification;
@@ -804,7 +804,7 @@ class NotificationMessage extends MessageList.Message {
         this.datetime = n.datetime;
         this.setIcon(this._getIcon());
         this.setTitle(n.title);
-        this.setBody(n.bannerBodyText);
+        this.setBody(n.body);
         this.setUseBodyMarkup(n.bannerBodyMarkup);
     }
 

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index c0d7c4a739ea0e01ffca252cac9123ac4bd4491e..023e56f4dee9391778836c37055086b8961a6e82 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -408,7 +408,7 @@ export const Notification = GObject.registerClass({
         this.isTransient = false;
         this.privacyScope = PrivacyScope.USER;
         this.forFeedback = false;
-        this.bannerBodyText = null;
+        this.body = null;
         this.bannerBodyMarkup = false;
         this.sound = null;
         this._soundPlayed = false;
@@ -441,7 +441,7 @@ export const Notification = GObject.registerClass({
         });
 
         this.title = title;
-        this.bannerBodyText = banner;
+        this.body = banner;
         this.bannerBodyMarkup = params.bannerMarkup;
 
         if (params.datetime)

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 29240a9413e3c6085fdd2c6516e4324979e23ddf..08f10da5314790f0fc2902666265781c65b29e6a 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -140,8 +140,8 @@ const NotificationsBox = GObject.registerClass({
                 continue;
 
             let body = '';
-            if (n.bannerBodyText) {
-                const bodyText = n.bannerBodyText.replace(/\n/g, ' ');
+            if (n.body) {
+                const bodyText = n.body.replace(/\n/g, ' ');
                 body = n.bannerBodyMarkup
                     ? bodyText
                     : GLib.markup_escape_text(bodyText, -1);